Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatic PR to nightly from 2023-06-12T14:11:27Z #5282

Merged
merged 49 commits into from
Jul 28, 2023
Merged

Automatic PR to nightly from 2023-06-12T14:11:27Z #5282

merged 49 commits into from
Jul 28, 2023

Conversation

milkmaker
Copy link
Collaborator

@milkmaker milkmaker commented Jun 12, 2023 •
edited
Loading

📝 Brief description

Merge pull request #5090 from mailcow/staging
Merge pull request #5115 from mailcow/staging
Merge pull request #5132 from mailcow/staging
Merge pull request #5144 from mailcow/staging
Merge pull request #5148 from mailcow/staging
Merge pull request #5151 from mailcow/staging
Merge pull request #5154 from mailcow/staging
[Web] add cors to json_api
[Web] cors - add check if origin is valid
logger pdo exception handling workaround
Merge pull request #5165 from mailcow/staging
[Rspamd] add dot-stuffing to bcc forwarding
Merge pull request #5229 from mailcow/staging
Merge pull request #5230 from mailcow/staging
Merge pull request #5249 from mailcow/staging
Merge pull request #5250 from mailcow/staging
Rspamd returns 401 on unsuccesful logins
[API] Update swagger version
Merge pull request #5258 from mailcow/staging
Merge pull request #5264 from mailcow/staging
Merge pull request #5265 from mailcow/staging
Merge pull request #5266 from mailcow/staging
Merge pull request #5268 from mailcow/staging
[Dockerapi] add pubsub handler for broadcasting in ha setup
Update thollander/actions-comment-pull-request action to v2.4.0 (#5280)
Fix smtp settings for nextcloud v26
Update dependency nextcloud/server to v27
[API] Update swagger version
[API] Update swagger version
New Symbols defined for Security ClamAV DBs
Improved Scores
Changed weight to score for CLAMD_SPAM
Merge pull request #5284 from mailcow:renovate/nextcloud-server-27.x
Merge pull request #5283 from superpuffin:master
Merge pull request #5263 from mailcow:update-api
Merge pull request #5262 from mailcow/fix-5252
[Web] add CLUSTERMODE environment variable
[Dockerapi] add missing import os
Merge pull request #5213 from mailcow/feat/cors
[Web] fix rspamd-history
Merge pull request #5312 from mailcow/fix/ui-logs
Merge pull request #5310 from mailcow/feat/ha-pubsub
Merge pull request #5221 from mailcow/fix/dot-stuffing-bcc
Merge pull request #5215 from goodygh/5136-fix-logger-error-handling
Fixes several instances of missing , extra role='tabpanel' and misspelled 'collapse'
Merge pull request #5316 from mailcow/feat/rspamd-securite-symbols
Merge pull request #5315 from SnailShea/fix/twig-typos
Merge pull request #5295 from mailcow/feat/spamhaus-dqs-asn
Update dependency nextcloud/server to v27.0.1 (#5324)
[Web] fix visual bug #5322
[Dockerapi] Update to 2.05
[Web] display is_catch_all and aliases_send_as_all if not empty #5320
[Web] add edit/cors api endpoint to swagger
[Web] change style of f2b active ban actions
[Web] change style of f2b active ban actions
Merge branch 'feat/spamhaus-dqs-asn' into staging
Fixed Syntax error in generate_config.sh

💻 Commits

📁 Modified files

.github/workflows/check_prs_if_on_staging.yml | 2 +-
data/Dockerfiles/dockerapi/Dockerfile | 7 +-
data/Dockerfiles/dockerapi/docker-entrypoint.sh | 2 +-
data/Dockerfiles/dockerapi/dockerapi.py (gone) | 549 ---------------------
data/Dockerfiles/dockerapi/main.py (new) | 260 ++++++++++
.../dockerapi/modules/DockerApi.py (new) | 487 ++++++++++++++++++
.../dockerapi/modules/init.py (new) | 0
data/conf/nginx/includes/site-defaults.conf | 2 +-
data/conf/rspamd/local.d/composites.conf | 36 ++
data/conf/rspamd/lua/rspamd.local.lua | 8 +-
data/web/admin.php | 6 +
data/web/api/openapi.yaml | 48 +-
data/web/api/swagger-initializer.js | 3 +-
data/web/api/swagger-ui-bundle.js | 2 +-
data/web/api/swagger-ui-bundle.js.map | 2 +-
data/web/api/swagger-ui-es-bundle-core.js | 2 +-
data/web/api/swagger-ui-es-bundle-core.js.map | 2 +-
data/web/api/swagger-ui-es-bundle.js | 2 +-
data/web/api/swagger-ui-es-bundle.js.map | 2 +-
data/web/api/swagger-ui-standalone-preset.js | 2 +-
data/web/api/swagger-ui-standalone-preset.js.map | 2 +-
data/web/api/swagger-ui.css | 2 +-
data/web/api/swagger-ui.css.map | 2 +-
data/web/api/swagger-ui.js | 2 +-
data/web/api/swagger-ui.js.map | 2 +-
data/web/inc/functions.docker.inc.php | 11 +
data/web/inc/functions.inc.php | 119 ++++-
data/web/inc/functions.mailbox.inc.php | 20 +-
data/web/js/site/debug.js | 2 +-
data/web/json_api.php | 31 +-
data/web/lang/lang.de-de.json | 4 +
data/web/lang/lang.en-gb.json | 6 +
data/web/templates/admin/tab-config-admins.twig | 37 +-
data/web/templates/admin/tab-config-customize.twig | 4 +-
data/web/templates/admin/tab-config-dkim.twig | 4 +-
data/web/templates/admin/tab-config-f2b.twig | 12 +-
data/web/templates/admin/tab-config-fwdhosts.twig | 4 +-
data/web/templates/admin/tab-config-oauth2.twig | 4 +-
.../admin/tab-config-password-policy.twig | 4 +-
.../web/templates/admin/tab-config-quarantine.twig | 4 +-
data/web/templates/admin/tab-config-quota.twig | 4 +-
data/web/templates/admin/tab-config-rsettings.twig | 4 +-
data/web/templates/admin/tab-config-rspamd.twig | 4 +-
.../templates/admin/tab-globalfilter-regex.twig | 4 +-
data/web/templates/admin/tab-ldap.twig | 4 +-
data/web/templates/admin/tab-routing.twig | 6 +-
data/web/templates/admin/tab-sys-mails.twig | 4 +-
data/web/templates/debug.twig | 4 +-
data/web/templates/mailbox/tab-bcc.twig | 2 +-
data/web/templates/mailbox/tab-domain-aliases.twig | 2 +-
data/web/templates/mailbox/tab-domains.twig | 2 +-
data/web/templates/mailbox/tab-filters.twig | 2 +-
data/web/templates/mailbox/tab-mailboxes.twig | 2 +-
data/web/templates/mailbox/tab-mbox-aliases.twig | 2 +-
data/web/templates/mailbox/tab-resources.twig | 2 +-
data/web/templates/mailbox/tab-syncjobs.twig | 2 +-
.../templates/mailbox/tab-templates-domains.twig | 2 +-
data/web/templates/mailbox/tab-templates-mbox.twig | 2 +-
data/web/templates/mailbox/tab-tls-policy.twig | 2 +-
data/web/templates/user/AppPasswds.twig | 4 +-
data/web/templates/user/Pushover.twig | 4 +-
data/web/templates/user/SpamAliases.twig | 4 +-
data/web/templates/user/Spamfilter.twig | 4 +-
data/web/templates/user/Syncjobs.twig | 4 +-
data/web/templates/user/tab-user-auth.twig | 4 +-
data/web/templates/user/tab-user-details.twig | 10 +-
data/web/templates/user/tab-user-settings.twig | 4 +-
docker-compose.yml | 3 +-
generate_config.sh | 2 +-
helper-scripts/nextcloud.sh | 4 +-
70 files changed, 1138 insertions(+), 665 deletions(-)

FreddleSpl0it and others added 11 commits April 26, 2023 10:46
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

superpuffin and others added 14 commits June 13, 2023 10:54
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@FreddleSpl0it
Merge pull request #5215 from goodygh/5136-fix-logger-error-handling
cf239dd 
[web] logger pdo exception handling workaround
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

SnailShea and others added 2 commits July 11, 2023 19:00
Fixes several instances of missing </span>, extra role='tabpanel' and…
b903cf3 
… misspelled 'collapse'
@DerLinkman
Merge pull request #5316 from mailcow/feat/rspamd-securite-symbols
2b009c7 
[Rspamd] Native mailcow Support for Securite ClamAV Signatures
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@FreddleSpl0it
Merge pull request #5315 from SnailShea/fix/twig-typos
03580cb 
Fixes several instances of missing </span>, extra role='tabpanel' and…
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

DerLinkman and others added 2 commits July 13, 2023 16:42
@DerLinkman
Update postfix.sh to include pbl for dqs
ec8d298
@renovate
Update dependency nextcloud/server to v27.0.1 (#5324)
521120a 
Signed-off-by: milkmaker <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@DerLinkman DerLinkman merged commit c200644 into nightly Jul 28, 2023
15 of 16 checks passed
This was referenced Jul 28, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DerLinkman DerLinkman Awaiting requested review from DerLinkman

Assignees

@DerLinkman DerLinkman

Labels
upstream
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@milkmaker @DerLinkman @FreddleSpl0it @goodygh @MAGICCC @superpuffin